Set GCONF_DEFAULT_SOURCE_PATH from the gnome-shell wrapper script

Needed so that a jhbuilt gnome-shell can find its schemas at runtime

diff --git a/src/Makefile.am b/src/Makefile.am
index e0aab00a762a4cc65c36e801cd210ab3909bbd04..e752ffa3f6c3a7edc9dab9d7cea63501ab609173 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,7 @@ gnome-shell: gnome-shell.in
            -e "s|@libexecdir[@]|$(libexecdir)|" \
            -e "s|@libdir[@]|$(libdir)|" \
            -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
+           -e "s|@sysconfdir[@]|$(sysconfdir)|" \
            $< > $@ && chmod a+x $@
 CLEANFILES += gnome-shell
 EXTRA_DIST += gnome-shell.in

diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 96c14ec093da5f9b240bd06ddf40e1afcbae23c6..f1d5e0ba4047db2e63ceffcf279d0104e269527c 100755 (executable)
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -141,6 +141,10 @@ def start_shell():
         env.update({'GNOME_SHELL_DATADIR' : data_dir,
                     'GI_TYPELIB_PATH'     : typelib_dir})
 
+    jhbuild_gconf_source = os.path.join('@sysconfdir@', 'gconf/2/path.jhbuild')
+    if os.path.exists(jhbuild_gconf_source):
+        env['GCONF_DEFAULT_SOURCE_PATH'] = jhbuild_gconf_source
+
     # Work around Ubuntu xulrunner bug,
     # http://bugzilla.gnome.org/show_bug.cgi?id=573413
     pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],